From b0ca0f13f6dd89df632ef7884f3ba903422cfb1d Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Wed, 7 Feb 2007 18:47:04 +0000 Subject: [PATCH] Make user_ip in user_newtalk a TEXT, as it is not an IP field. --- maintenance/postgres/tables.sql | 2 +- maintenance/updaters.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 4dca3b1b7a..62e021e87a 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -42,7 +42,7 @@ CREATE UNIQUE INDEX user_groups_unique ON user_groups (ug_user, ug_group); CREATE TABLE user_newtalk ( user_id INTEGER NOT NULL REFERENCES mwuser(user_id) ON DELETE CASCADE, - user_ip CIDR NULL + user_ip TEXT NULL ); CREATE INDEX user_newtalk_id_idx ON user_newtalk (user_id); CREATE INDEX user_newtalk_ip_idx ON user_newtalk (user_ip); diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index 454f082b02..99cd39c5d0 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -1222,6 +1222,8 @@ DO INSTEAD DELETE FROM archive2 a2 WHERE a2.ar_namespace = OLD.ar_namespace AND a2.ar_rev_id = OLD.ar_rev_id; +-- Another misleadingly named column! :) +ALTER TABLE user_newtalk ALTER user_ip TYPE TEXT USING host(user_ip); -- Note this upgrade INSERT INTO mediawiki_version (type,mw_version,notes) -- 2.20.1